forked from ros/rosdistro
-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge upstream #148
Merged
f-fl0
merged 1,789 commits into
alpine-custom-apk
from
merge-upstream-2023-07-18-13-19-49
Jul 18, 2023
Merged
Merge upstream #148
f-fl0
merged 1,789 commits into
alpine-custom-apk
from
merge-upstream-2023-07-18-13-19-49
Jul 18, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…es (ros#37537) * Add a copy-pastable review checklist for new packages Signed-off-by: Emerson Knapp <[email protected]>
…ros#37637)" (ros#37745) This reverts commit a5c836d.
Signed-off-by: Michel Hidalgo <[email protected]>
Signed-off-by: Chris Lalancette <[email protected]>
* Add ros2_kortex src to Iron This is the Iron version of ros2_kortex which was added to Humble in ros#37893 This ros_kortex was added to Noetic in ros#37856 packages include: - kortex_api - kortex_bringup - kortex_description - kortex_driver - kortex_moveit_config The only name change between ros_kortex and ros2_kortex is: - kortex_move_it_config -> kortex_moveit_config The source code is now open here: https://github.com/PickNikRobotics/ros2_kortex The repository will eventually be transferred to the KinovaRobotics GitHub organization. But we will do this after releasing and supporting the initial release. - ros2-gbp/ros2-gbp-github-org#291 - ros2-gbp/ros2-gbp-github-org#294 Signed-off-by: Alexander Moriarty <[email protected]> * iron: ros2_kortex add doc entry Signed-off-by: Alexander Moriarty <[email protected]> --------- Signed-off-by: Alexander Moriarty <[email protected]>
…ros#37906)" (ros#37995) This reverts commit 47ed2b6.
at-wat
approved these changes
Jul 18, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #147. The following files were edited manually to fix the merge conflicts (https://github.com/alpine-ros/rosdistro/actions/runs/5583218541/jobs/10203306712)